debian/patches: Add back the use-system-libraries patch

diff --git a/debian/patches/0003-use-system-libraries.patch b/debian/patches/0003-use-system-libraries.patch
new file mode 100644 (file)
index 0000000..88812ad
--- /dev/null
+++ b/debian/patches/0003-use-system-libraries.patch
@@ -0,0 +1,23 @@
+From: Boyuan Yang <byang@debian.org>
+Date: Sat, 23 May 2020 11:11:46 -0400
+Subject: use-system-libraries
+
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4883990..fdca00c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ include (GenerateExportHeader)
+-include_directories(../deps/marisa-0.2.5/include)
+-include_directories(../deps/rapidjson-1.1.0)
+-include_directories(../deps/tclap-1.2.2)
++include_directories(/usr/include/marisa)
++include_directories(/usr/include/rapidjson)
++include_directories(/usr/includ/tclap)
+ 
+ # Library
+ 

diff --git a/debian/patches/series b/debian/patches/series
index a2300cf87d3c36a5fc332d936e553c157f3116c6..850b4d462c1e4ab55d586929014d1629abd91537 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use-cmake-install-libdir.patch
 0004-data-Explicitly-use-python3.patch
+0003-use-system-libraries.patch

diff --git a/debian/patches/use-cmake-install-libdir.patch b/debian/patches/use-cmake-install-libdir.patch
index cf3a2cec877c237aa032b2f3ad006b8a858a28a3..9677493073a0317534ad9fc8ac44ebc4fd0b75cc 100644 (file)
--- a/debian/patches/use-cmake-install-libdir.patch
+++ b/debian/patches/use-cmake-install-libdir.patch
@@ -8,10 +8,10 @@ Subject: use-cmake-install-libdir
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c9ee72..12dd36c 100644
+index 05fff42..876bfb1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -68,7 +68,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
+@@ -73,7 +73,7 @@ set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
  set (DIR_INCLUDE ${DIR_PREFIX}/include/)
  set (DIR_SHARE ${DIR_PREFIX}/share/)
  set (DIR_ETC ${DIR_PREFIX}/etc/)